Skip to content

Enforce rollback safety PR checks - #5731

Merged
bfops merged 94 commits into
masterfrom
bfops/rollback-safety
Sep 1, 2026
Merged

Enforce rollback safety PR checks#5731
bfops merged 94 commits into
masterfrom
bfops/rollback-safety

Conversation

@bfops

@bfops bfops commented Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Description of Changes

Updates the PR template with a new section for noting PRs that must be released before the current PR can merge. We also add a CI check that this field has been updated, and to enforce that those PRs have actually been released.

A lot of the logic is added in a separate library so that it could hypothetically be used either from release flows or CI flows, without introducing a direct dependency between the two of them (it's not obvious to me that CI "should" depend on release, or vice-versa).

API and ABI breaking changes

None

Expected complexity level and risk

2

Rollback safety impact

n/a

Testing

  • Added unit tests for the functionality to parse a PR description
  • The new check..
    • re-runs on PR description changes (CI job)
    • fails on this PR with a missing release deps section (CI job)
    • fails on this PR with a default release deps section (CI job)
    • fails on this PR if I mention an open PR (CI job)
    • fails on this PR if I mention a merged, unreleased PR (CI job)
    • if I mention multiple unreleased PRs, it shows all failures (CI job)
    • succeeds if I mention only a released PR (CI job)
    • fails if I remove the default text and leave the section blank (CI job)
    • succeeds if I change the section to say n/a (CI job)
    • fails if I mention a PR from another repository (CI job)

clockwork-labs-bot and others added 30 commits August 7, 2026 12:01
…rgo-ci-merge-5687

# Conflicts:
#	tools/ci/README.md
#	tools/ci/src/main.rs
Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com>
Comment thread .github/workflows/ci.yml Outdated
Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com>
Comment thread tools/ci/commands/check-release-deps/src/main.rs Outdated
Signed-off-by: Zeke Foppa <196249+bfops@users.noreply.github.com>
Comment thread tools/rollback-coordination/src/gh.rs Outdated
@bfops
bfops force-pushed the bfops/rollback-safety branch from 283bfd0 to c982950 Compare August 19, 2026 21:00

@jdetter jdetter left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small review for now

Comment thread .github/workflows/check-pr-base.yml
Comment thread tools/rollback-coordination/src/pr_parsing.rs Outdated

@jdetter jdetter left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few more Qs on this. I don't have anything blocking so after you respond I'm pretty much fine to approve 👍

Comment thread tools/rollback-coordination/src/pr_parsing.rs
Comment thread tools/rollback-coordination/src/pr_parsing.rs

@jdetter jdetter left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great now, thanks for the updates 👍

@bfops
bfops enabled auto-merge September 1, 2026 16:55
@bfops
bfops disabled auto-merge September 1, 2026 16:59

@gefjon gefjon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new PR template looks great, thanks!

@bfops
bfops added this pull request to the merge queue Sep 1, 2026
Merged via the queue into master with commit 7c462bb Sep 1, 2026
62 of 64 checks passed
@bfops
bfops deleted the bfops/rollback-safety branch September 1, 2026 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants